screenShield: Pop modes before starting unlock animation

This way the top panel remains visible while the shield hiding
animation is ongoing instead of suddenly appearing just when it ends.

https://bugzilla.gnome.org/show_bug.cgi?id=692966

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 8dac44815d2bdd2d5110fcc97c096384d5c35acc..3da3b0181aea3eab956081caf9ec5d67eb7abc94 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1055,6 +1055,11 @@ const ScreenShield = new Lang.Class({
     deactivate: function(animate) {
         this._hideLockScreen(animate, 0);
 
+        if (Main.sessionMode.currentMode == 'lock-screen')
+            Main.sessionMode.popMode('lock-screen');
+        if (Main.sessionMode.currentMode == 'unlock-dialog')
+            Main.sessionMode.popMode('unlock-dialog');
+
         Tweener.addTween(this._lockDialogGroup, {
             scale_x: 0,
             scale_y: 0,
@@ -1083,11 +1088,6 @@ const ScreenShield = new Lang.Class({
 
         this.actor.hide();
 
-        if (Main.sessionMode.currentMode == 'lock-screen')
-            Main.sessionMode.popMode('lock-screen');
-        if (Main.sessionMode.currentMode == 'unlock-dialog')
-            Main.sessionMode.popMode('unlock-dialog');
-
         if (this._becameActiveId != 0) {
             this.idleMonitor.disconnect(this._becameActiveId);
             this._becameActiveId = 0;